restore the else case of #ifdef __GNUC__ #66225

	* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
	#66225

diff --git a/ChangeLog b/ChangeLog
index d20b43a59ec77a28d0f5cd3b61f2a8f5d65549c5..4f3588b3b7e09cd76ac7c308f9e54e90a58f5999 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec  4 21:46:13 2001  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
+       #66225
+       
 2001-12-04  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkmain.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d20b43a59ec77a28d0f5cd3b61f2a8f5d65549c5..4f3588b3b7e09cd76ac7c308f9e54e90a58f5999 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Dec  4 21:46:13 2001  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
+       #66225
+       
 2001-12-04  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkmain.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d20b43a59ec77a28d0f5cd3b61f2a8f5d65549c5..4f3588b3b7e09cd76ac7c308f9e54e90a58f5999 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Dec  4 21:46:13 2001  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
+       #66225
+       
 2001-12-04  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkmain.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d20b43a59ec77a28d0f5cd3b61f2a8f5d65549c5..4f3588b3b7e09cd76ac7c308f9e54e90a58f5999 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Dec  4 21:46:13 2001  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
+       #66225
+       
 2001-12-04  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkmain.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d20b43a59ec77a28d0f5cd3b61f2a8f5d65549c5..4f3588b3b7e09cd76ac7c308f9e54e90a58f5999 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Dec  4 21:46:13 2001  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
+       #66225
+       
 2001-12-04  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkmain.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d20b43a59ec77a28d0f5cd3b61f2a8f5d65549c5..4f3588b3b7e09cd76ac7c308f9e54e90a58f5999 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Dec  4 21:46:13 2001  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
+       #66225
+       
 2001-12-04  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkmain.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d20b43a59ec77a28d0f5cd3b61f2a8f5d65549c5..4f3588b3b7e09cd76ac7c308f9e54e90a58f5999 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Dec  4 21:46:13 2001  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
+       #66225
+       
 2001-12-04  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkmain.c

diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 0ce4ac99406924ea29cb2226f310888f56749479..030535e6fae0367099c31a7d576a85e0acaf1ecc 100644 (file)
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -184,6 +184,8 @@ struct _GtkTreeViewPrivate
   GtkDestroyNotify search_destroy;
 };
 
+#ifdef __GNUC__
+
 #define TREE_VIEW_INTERNAL_ASSERT(expr, ret)     G_STMT_START{          \
      if (!(expr))                                                       \
        {                                                                \
@@ -218,6 +220,41 @@ struct _GtkTreeViewPrivate
          return;                                                        \
        };                               }G_STMT_END
 
+#else
+
+#define TREE_VIEW_INTERNAL_ASSERT(expr, ret)     G_STMT_START{          \
+     if (!(expr))                                                       \
+       {                                                                \
+         g_log (G_LOG_DOMAIN,                                           \
+                G_LOG_LEVEL_CRITICAL,                                   \
+               "file %s: line %d: assertion `%s' failed.\n"       \
+               "There is a disparity between the internal view of the GtkTreeView,\n"    \
+               "and the GtkTreeModel.  This generally means that the model has changed\n"\
+               "without letting the view know.  Any display from now on is likely to\n"  \
+               "be incorrect.\n",                                                        \
+                __FILE__,                                               \
+                __LINE__,                                               \
+                #expr);                                                 \
+         return ret;                                                    \
+       };                               }G_STMT_END
+
+#define TREE_VIEW_INTERNAL_ASSERT_VOID(expr)     G_STMT_START{          \
+     if (!(expr))                                                       \
+       {                                                                \
+         g_log (G_LOG_DOMAIN,                                           \
+                G_LOG_LEVEL_CRITICAL,                                   \
+               "file %s: line %d: assertion '%s' failed.\n"            \
+               "There is a disparity between the internal view of the GtkTreeView,\n"    \
+               "and the GtkTreeModel.  This generally means that the model has changed\n"\
+               "without letting the view know.  Any display from now on is likely to\n"  \
+               "be incorrect.\n",                                                        \
+                __FILE__,                                               \
+                __LINE__,                                               \
+                #expr);                                                 \
+         return;                                                        \
+       };                               }G_STMT_END
+#endif
+
 
 /* functions that shouldn't be exported */
 void         _gtk_tree_selection_internal_select_node (GtkTreeSelection  *selection,